From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 28 Jun 2006 19:15:32 +0000 (+0000)
Subject: Allow use of arbitrray prefix *and* dest namespace key
X-Git-Tag: 1.31.0-rc.0~56550
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=a237d49aaad005307f8f05cb34cab1c813a280b2;p=lhc%2Fweb%2Fwiklou.git

Allow use of arbitrray prefix *and* dest namespace key
---

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 929bf73884..ad56eee7c1 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -79,9 +79,9 @@ class NamespaceConflictChecker {
 	/**
 	 * @fixme: do this for reals
 	 */
-	function checkInterwiki( $prefix, $fix, $suffix = '' ) {
-		echo "Checking interwiki prefix \"$prefix\"\n";
-		return $this->checkNamespace( 0, $prefix, $fix, $suffix );
+	function checkPrefix( $key, $prefix, $fix, $suffix = '' ) {
+		echo "Checking prefix \"$prefix\" vs namespace $key\n";
+		return $this->checkNamespace( $key, $prefix, $fix, $suffix );
 	}
 
 	function getConflicts( $ns, $name ) {
@@ -173,11 +173,12 @@ $wgTitle = Title::newFromText( 'Namespace title conflict cleanup script' );
 $fix = isset( $options['fix'] );
 $suffix = isset( $options['suffix'] ) ? $options['suffix'] : '';
 $prefix = isset( $options['prefix'] ) ? $options['prefix'] : '';
+$key = isset( $options['key'] ) ? intval( $options['key'] ) : 0;
 $dbw =& wfGetDB( DB_MASTER );
 $duper = new NamespaceConflictChecker( $dbw );
 
 if( $prefix ) {
-	$retval = $duper->checkInterwiki( $prefix, $fix, $suffix );
+	$retval = $duper->checkPrefix( $key, $prefix, $fix, $suffix );
 } else {
 	$retval = $duper->checkAll( $fix, $suffix );
 }